use QStringLiteral with constant QStrings and QString::arg(*).

diff --git a/csv_util.cc b/csv_util.cc
index 65448e24fb1cb4a623a7babb155531a1e16fb8ec..bff9907a8028c255252deb211d09ddd1341f5232 100644 (file)
--- a/csv_util.cc
+++ b/csv_util.cc
@@ -55,7 +55,7 @@ csv_stringclean(const QString& source, const QString& to_nuke)
     // avoid problematic regular rexpressions, e.g. xmapwpt generated [:\n:],
     // or one can imagine [0-9] when we meant the characters, '0', '-', and '9',
     // or one can imagine [^a] when we meant the characters '^' and 'a'.
-    QRegularExpression regex = QRegularExpression(QString("[%1]").arg(QRegularExpression::escape(to_nuke)));
+    QRegularExpression regex = QRegularExpression(QStringLiteral("[%1]").arg(QRegularExpression::escape(to_nuke)));
     assert(regex.isValid());
     r.remove(regex);
   }

diff --git a/dg-100.cc b/dg-100.cc
index 32dcd5a8258462e4b79d52a729c497263ca140fd..a1f31045fb6646b709c2645b91128ba62f21f806 100644 (file)
--- a/dg-100.cc
+++ b/dg-100.cc
@@ -203,7 +203,7 @@ Dg100Format::process_gpsfile(uint8_t data[], route_head** track) const
       QDateTime creation_time = bintime2utc(bindate, bintime);
       QString datetime = creation_time.toString("yyyy/MM/dd hh:mm:ss");
       *track = new route_head;
-      (*track)->rte_name = QString("%1 tracklog (%2)").arg(model->name, datetime);
+      (*track)->rte_name = QStringLiteral("%1 tracklog (%2)").arg(model->name, datetime);
       (*track)->rte_desc = "GPS tracklog data";
       track_add_head(*track);
     }

diff --git a/garmin_fit.cc b/garmin_fit.cc
index 7a9227689dc870314dc6e90e7015f4df40b3ae6b..2e68b4995d73748d1d9fc91fccce69af6ee73a3f 100644 (file)
--- a/garmin_fit.cc
+++ b/garmin_fit.cc
@@ -239,7 +239,7 @@ GarminFitFormat::fit_parse_definition_message(uint8_t header)
   // second byte is endianness
   def.endian = fit_getuint8();
   if (def.endian > 1) {
-    throw ReaderException(QString("Bad endian field 0x%1 at file position 0x%2.").arg(def.endian, 0, 16).arg(gbftell(fin) - 1, 0, 16).toStdString());
+    throw ReaderException(QStringLiteral("Bad endian field 0x%1 at file position 0x%2.").arg(def.endian, 0, 16).arg(gbftell(fin) - 1, 0, 16).toStdString());
   }
   fit_data.endian = def.endian;
 
@@ -675,7 +675,7 @@ GarminFitFormat::fit_parse_data(const fit_message_def& def, int time_offset)
     auto* lappt = new Waypoint;
     lappt->latitude = GPS_Math_Semi_To_Deg(endlat);
     lappt->longitude = GPS_Math_Semi_To_Deg(endlon);
-    lappt->shortname = QString("LAP%1").arg(++lap_ct, 3, 10, QLatin1Char('0'));
+    lappt->shortname = QStringLiteral("LAP%1").arg(++lap_ct, 3, 10, QLatin1Char('0'));
     waypt_add(lappt);
   }
   break;

diff --git a/garmin_gpi.cc b/garmin_gpi.cc
index 9c61da04256273e29c0d9f4082a0065f89bcf5a3..f7a0c7cdcf7606972e784fb43063c745341563cc 100644 (file)
--- a/garmin_gpi.cc
+++ b/garmin_gpi.cc
@@ -395,7 +395,7 @@ GarminGPIFormat::read_tag(const char* caller, const int tag, Waypoint* wpt)
           speed = MPS_TO_KPH(speed);
         }
         QString base = wpt->shortname.isEmpty() ? "WPT" : wpt->shortname;
-        wpt->shortname = base + QString("@%1").arg(speed,0,'f',0);
+        wpt->shortname = base + QStringLiteral("@%1").arg(speed,0,'f',0);
       }
     }
 
@@ -1230,7 +1230,7 @@ GarminGPIFormat::rd_init(const QString& fname)
   read_header();
 
   if ((codepage >= 1250) && (codepage <= 1257)) {
-    QString qCodecName = QString("windows-%1").arg(codepage);
+    QString qCodecName = QStringLiteral("windows-%1").arg(codepage);
     cet_convert_init(CSTR(qCodecName), 1);
   } else if (codepage == 65001) {
     cet_convert_init("utf8", 1);
@@ -1273,7 +1273,7 @@ GarminGPIFormat::wr_init(const QString& fname)
   codepage = 0;
 
   for (int i = 1250; i <= 1257; i++) {
-    if (QString("windows-%1").arg(i).compare(QString(opt_writecodec), Qt::CaseInsensitive) == 0) {
+    if (QStringLiteral("windows-%1").arg(i).compare(QString(opt_writecodec), Qt::CaseInsensitive) == 0) {
       codepage = i;
       break;
     }

diff --git a/garmin_tables.cc b/garmin_tables.cc
index a0f1c3e97695c76b8994f6e43619b391d6dfe765..fb67d4b98ab364939edae31b892af210a0c53014 100644 (file)
--- a/garmin_tables.cc
+++ b/garmin_tables.cc
@@ -424,11 +424,11 @@ QString
 gt_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format)
 {
   if ((garmin_format == GDB) && (icon >= 500) && (icon <= 563)) {
-    return QString("Custom %1").arg(icon - 500);
+    return QStringLiteral("Custom %1").arg(icon - 500);
   }
 
   if ((garmin_format == PCX) && (icon >= 7680) && (icon <= 8191)) {
-    return QString("Custom %1").arg(icon - 7680);
+    return QStringLiteral("Custom %1").arg(icon - 7680);
   }
 
   for (const icon_mapping_t* i = garmin_icon_table; i->icon; i++) {

diff --git a/gdb.cc b/gdb.cc
index 5e32775a5bb5323f44983ee9fabd74dce85867da..db460883945572cba7e29d040f3c2cd76f941d6d 100644 (file)
--- a/gdb.cc
+++ b/gdb.cc
@@ -284,22 +284,22 @@ QString GdbFormat::gdb_to_ISO8601_duration(unsigned int seconds)
   unsigned int days = seconds / 86400u;
   QString out = "P";
   if (days != 0) {
-    out.append(QString("D%1").arg(days));
+    out.append(QStringLiteral("D%1").arg(days));
     seconds -= 86400u * days;
   }
   out.append(QString("T"));
   unsigned int hours = seconds / 3600u;
   if (hours != 0) {
-    out.append(QString("%1H").arg(hours));
+    out.append(QStringLiteral("%1H").arg(hours));
     seconds -= 3600u * hours;
   }
   unsigned int minutes = seconds / 60u;
   if (minutes != 0) {
-    out.append(QString("%1M").arg(minutes));
+    out.append(QStringLiteral("%1M").arg(minutes));
     seconds -= 60u * minutes;
   }
   if (seconds != 0) {
-    out.append(QString("%1S").arg(seconds));
+    out.append(QStringLiteral("%1S").arg(seconds));
   }
   return out;
 }
@@ -578,7 +578,7 @@ GdbFormat::read_waypoint(gt_waypt_classes_e* waypt_class_out)
     res->description = FREAD_CSTR_AS_QSTR;     /* instruction */
     if (wpt_class == gt_waypt_class_map_intersection || wpt_class == gt_waypt_class_map_line) {
       garmin_fs_t::set_duration(gmsd, duration);
-      res->notes = QString("[%1]").arg(gdb_to_ISO8601_duration(duration));
+      res->notes = QStringLiteral("[%1]").arg(gdb_to_ISO8601_duration(duration));
 #if GDB_DEBUG
       DBG(GDB_DBG_WPTe, 1)
       printf(MYNAME "-wpt \"%s\" (%d): duration = %u\n",

diff --git a/gpssim.cc b/gpssim.cc
index 76aaff528fa5f1474c01067900265932b5af4d06..c71f4158a8d7fe8d397d33d1d50ff8c3831fc071 100644 (file)
--- a/gpssim.cc
+++ b/gpssim.cc
@@ -144,7 +144,7 @@ gpssim_trk_hdr(const route_head* rh)
       fatal(MYNAME ": output file already open.\n");
     }
 
-    QString ofname = QString("%1%2%3.gpssim").arg(fnamestr, doing_tracks ? "-track" : "-route").arg(trk_count++, 4, 10, QChar('0'));
+    QString ofname = QStringLiteral("%1%2%3.gpssim").arg(fnamestr, doing_tracks ? "-track" : "-route").arg(trk_count++, 4, 10, QChar('0'));
     fout = gbfopen(ofname, "wb", MYNAME);
   }
   (void) track_recompute(rh);

diff --git a/gtrnctr.cc b/gtrnctr.cc
index bc6aa09347026d6944e5b107f3948385834d2df5..bbc539ff9b419ac0c663117b8c0d95fb81ee0773 100644 (file)
--- a/gtrnctr.cc
+++ b/gtrnctr.cc
@@ -306,7 +306,7 @@ GtrnctrFormat::gtc_crs_hdr(const route_head* rte)
 
   if (!rte->rte_name.isEmpty()) {
     QString name = rte->rte_name.left(kGtcMaxNameLen);
-    gtc_write_xml(0, QString("<Name>%1</Name>\n").arg(name));
+    gtc_write_xml(0, QStringLiteral("<Name>%1</Name>\n").arg(name));
   } else {
     gtc_write_xml(0, "<Name>New Course</Name>\n");
   }

diff --git a/kml.cc b/kml.cc
index 4af7378e03b347229aa3bbe7a0346534933a3292..3abbbd4b654eabfc2e4460cacc3cad5ac95e5e5f 100644 (file)
--- a/kml.cc
+++ b/kml.cc
@@ -391,7 +391,7 @@ void KmlFormat::wr_init(const QString& fname)
 void KmlFormat::wr_position_init(const QString& fname)
 {
   posnfilename = fname;
-  posnfilenametmp = QString("%1-").arg(fname);
+  posnfilenametmp = QStringLiteral("%1-").arg(fname);
   realtime_positioning = 1;
   max_position_points = atoi(opt_max_position_points);
 }
@@ -842,9 +842,9 @@ void KmlFormat::kml_output_point(const Waypoint* waypointp, kml_point_type pt_ty
       if (trackdirection && (pt_type == kmlpt_track)) {
         QString value;
         if (waypointp->speed < 1) {
-          value = QString("%1-none").arg(style);
+          value = QStringLiteral("%1-none").arg(style);
         } else {
-          value = QString("%1-%2").arg(style)
+          value = QStringLiteral("%1-%2").arg(style)
                   .arg((int)(waypointp->course / 22.5 + .5) % 16);
         }
         writer->writeTextElement(QStringLiteral("styleUrl"), value);
@@ -1141,7 +1141,7 @@ QString KmlFormat::kml_lookup_gc_icon(const Waypoint* waypointp)
     break;
   }
 
-  return QString("https://www.geocaching.com/images/kml/%1").arg(icon);
+  return QStringLiteral("https://www.geocaching.com/images/kml/%1").arg(icon);
 }
 
 const char* KmlFormat::kml_lookup_gc_container(const Waypoint* waypointp)
@@ -1184,9 +1184,9 @@ QString KmlFormat::kml_gc_mkstar(int rating)
   }
 
   if (0 == rating % 10) {
-    star_content = QString("stars%1").arg(rating / 10);
+    star_content = QStringLiteral("stars%1").arg(rating / 10);
   } else {
-    star_content = QString("stars%1_%2").arg(rating / 10).arg(rating % 10);
+    star_content = QStringLiteral("stars%1_%2").arg(rating / 10).arg(rating % 10);
   }
 
   return star_content;
@@ -1770,7 +1770,7 @@ void KmlFormat::write()
     if (trackdirection) {
       kml_write_bitmap_style(kmlpt_other, ICON_TRK, "track-none");
       for (int i = 0; i < 16; ++i) {
-        kml_write_bitmap_style(kmlpt_other, QString(ICON_DIR).arg(i), QString("track-%1").arg(i));
+        kml_write_bitmap_style(kmlpt_other, QStringLiteral(ICON_DIR).arg(i), QStringLiteral("track-%1").arg(i));
       }
     } else {
       kml_write_bitmap_style(kmlpt_track, ICON_TRK, nullptr);

diff --git a/lowranceusr.cc b/lowranceusr.cc
index 6e17b72cad2e6b1ea88fdef1fcf095f8f32e5701..85b6f4c78b34c648013ce49b971c22c0a4d027ae 100644 (file)
--- a/lowranceusr.cc
+++ b/lowranceusr.cc
@@ -1549,7 +1549,7 @@ LowranceusrFormat::lowranceusr_trail_hdr(const route_head* trk)
   } else if (!trk->rte_desc.isEmpty()) {
     name = trk->rte_desc;
   } else {
-    name = name + QString("Babel %1").arg(trail_count);
+    name = name + QStringLiteral("Babel %1").arg(trail_count);
   }
 
   int text_len = name.length();

diff --git a/lowranceusr.h b/lowranceusr.h
index e51c3edd8223d6274662c3e641bd3aa484334195..c42bc3b88df454bc04571bded66a3004b3529804 100644 (file)
--- a/lowranceusr.h
+++ b/lowranceusr.h
@@ -484,7 +484,7 @@ private:
     }
 
     // Didn't find it in table, default to leave it as the number found
-    return QString("icon-%1").arg(icon);
+    return QStringLiteral("icon-%1").arg(icon);
   }
 
   template <typename T>

diff --git a/mtk_logger.cc b/mtk_logger.cc
index 39591da3eeba0db1b05722206c7ff01585b5f0d9..233aa083852307163e5530760e7608ed98acf9f9 100644 (file)
--- a/mtk_logger.cc
+++ b/mtk_logger.cc
@@ -803,7 +803,7 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
   if (global_opts.masked_objective& TRKDATAMASK && (trk_head == nullptr || (mtk_info.track_event & MTK_EVT_START))) {
     char spds[50];
     trk_head = new route_head;
-    trk_head->rte_name = QString("track-%1").arg(1 + track_count());
+    trk_head->rte_name = QStringLiteral("track-%1").arg(1 + track_count());
 
     spds[0] = '\0';
     if (mtk_info.speed > 0) {
@@ -896,7 +896,7 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
     /* Button press -- create waypoint, start count at 1 */
     auto* w = new Waypoint(*trk);
 
-    w->shortname = QString("WP%1").arg(waypt_count() + 1, 6, 10, QLatin1Char('0'));
+    w->shortname = QStringLiteral("WP%1").arg(waypt_count() + 1, 6, 10, QLatin1Char('0'));
     waypt_add(w);
   }
   // In theory we would not add the waypoint to the list of

diff --git a/nmea.cc b/nmea.cc
index dac71f88b0e5b1852c651287e003fb8c85da9d2d..8a3c9279526114b439b6034c7960ab302d4773d4 100644 (file)
--- a/nmea.cc
+++ b/nmea.cc
@@ -359,7 +359,7 @@ QTime NmeaFormat::nmea_parse_hms(const QString& str)
     if (retval.isValid() && parts.size() == 2) {
       bool ok;
       // prepend "0.".  prepending "." won't work if there are no trailing digits.
-      long msec = lround(1000.0 * QString("0.%1").arg(parts.at(1)).toDouble(&ok));
+      long msec = lround(1000.0 * QStringLiteral("0.%1").arg(parts.at(1)).toDouble(&ok));
       if (ok) {
         retval = retval.addMSecs(msec);
       } else {
@@ -631,7 +631,7 @@ NmeaFormat::gpzda_parse(const QString& ibuf)
   const QStringList fields = ibuf.split(',');
   if (fields.size() > 4) {
     QTime time = nmea_parse_hms(fields[1]);
-    QString datestr = QString("%1%2%3").arg(fields[2], fields[3], fields[4]);
+    QString datestr = QStringLiteral("%1%2%3").arg(fields[2], fields[3], fields[4]);
     QDate date = QDate::fromString(datestr, "ddMMyyyy");
 
     // The prev_datetime data member might be used by

diff --git a/osm.cc b/osm.cc
index 8929aa6c91a67add2d71441a9040a3aad39ffa1a..7e4e9077a77825d2d9876a4cc8a0d90ec04df00b 100644 (file)
--- a/osm.cc
+++ b/osm.cc
@@ -401,7 +401,7 @@ OsmFormat::osm_feature_symbol(const int ikey, const char* value) const
   if (values.contains(key)) {
     result = values.value(key)->icon;
   } else {
-    result = QString("%1:%2").arg(osm_features[ikey], value);
+    result = QStringLiteral("%1:%2").arg(osm_features[ikey], value);
   }
   return result;
 }

diff --git a/ozi.cc b/ozi.cc
index 3106237fc553252e8043201133391556887ee333..615b6a8a937dc10ba9682104c34d4fab96e053f3 100644 (file)
--- a/ozi.cc
+++ b/ozi.cc
@@ -197,7 +197,7 @@ ozi_get_time_str(const Waypoint* waypointp)
 {
   if (waypointp->creation_time.isValid()) {
     double time = (waypt_time(waypointp) / SECONDS_PER_DAY) + DAYS_SINCE_1990;
-    return QString("%1").arg(time, 0, 'f', 7);
+    return QStringLiteral("%1").arg(time, 0, 'f', 7);
   }
   return QString("");
 }
@@ -243,7 +243,7 @@ ozi_openfile(const QString& fname)
 
   QString buff;
   if ((track_out_count) && (ozi_objective == trkdata)) {
-    buff = QString("-%1").arg(track_out_count);
+    buff = QStringLiteral("-%1").arg(track_out_count);
   } else {
     buff = QString("");
   }
@@ -256,7 +256,7 @@ ozi_openfile(const QString& fname)
     sname.chop(suffix_len + 1);
   }
 
-  QString tmpname = QString("%1%2.%3").arg(sname, buff, ozi_extensions[ozi_objective]);
+  QString tmpname = QStringLiteral("%1%2.%3").arg(sname, buff, ozi_extensions[ozi_objective]);
 
   /* re-open file_out with the new filename */
   if (stream != nullptr) {

diff --git a/qstarz_bl_1000.cc b/qstarz_bl_1000.cc
index ebd488f5e0907051c219657ef96217fc5a3255dc..739af5aebed49b73294183107a7a60fbf6e16e76 100644 (file)
--- a/qstarz_bl_1000.cc
+++ b/qstarz_bl_1000.cc
@@ -254,7 +254,7 @@ QstarzBL1000Format::qstarz_bl_1000_read_record(QDataStream& stream, route_head*
 
   if (qstarz_bl_1000_is_waypoint_type(type)) {
     if (global_opts.synthesize_shortnames) {
-      waypoint->shortname = QString("WP%2").arg(waypt_count() + 1, 3, 10, QChar('0'));
+      waypoint->shortname = QStringLiteral("WP%2").arg(waypt_count() + 1, 3, 10, QChar('0'));
       waypoint->wpt_flags.shortname_is_synthetic = 1;
     }
     waypt_add(waypoint);

diff --git a/route.cc b/route.cc
index 115a119fe9c551110a3fd6c081bd5439eb1c2bd2..dea0dba264ac2c8946bcac58c2d7fb6691cb4e58 100644 (file)
--- a/route.cc
+++ b/route.cc
@@ -339,7 +339,7 @@ computed_trkdata track_recompute(const route_head* trk)
     }
 
     if (thisw->shortname.isEmpty()) {
-      thisw->shortname = QString("%1-%2").arg(trk->rte_name).arg(tkpt);
+      thisw->shortname = QStringLiteral("%1-%2").arg(trk->rte_name).arg(tkpt);
     }
     tkpt++;
     prev = thisw;

diff --git a/skytraq.cc b/skytraq.cc
index faf55e773117c5ae2bbbb6dd8fb0ef7fcbd9cc7b..6b0e3800b6da6f2971ff37ddf5fe4eafd33a5fd0 100644 (file)
--- a/skytraq.cc
+++ b/skytraq.cc
@@ -606,7 +606,7 @@ SkytraqBase::make_trackpoint(struct read_state* st, double lat, double lon, doub
 {
   auto* wpt = new Waypoint;
 
-  wpt->shortname = QString("TP%1").arg(++st->tpn, 4, 10, QLatin1Char('0'));
+  wpt->shortname = QStringLiteral("TP%1").arg(++st->tpn, 4, 10, QLatin1Char('0'));
 
   wpt->latitude       = lat;
   wpt->longitude      = lon;

diff --git a/tpo.cc b/tpo.cc
index cdd985deb81fce428732638e087a81ba7e647a7a..896bda59be8b4cd267137cc56d2811e63536a779 100644 (file)
--- a/tpo.cc
+++ b/tpo.cc
@@ -279,7 +279,7 @@ static void tpo_read_2_x()
     track_add_head(track_temp);
 
     /* generate a generic track name */
-    track_temp->rte_name = QString("Track %1").arg(i+1);
+    track_temp->rte_name = QStringLiteral("Track %1").arg(i+1);
 
     /* zoom level 1-5 visibility flags */
     gbfread(&buff[0], 1, 10, tpo_file_in);
@@ -566,7 +566,7 @@ static void tpo_process_tracks()
     if (tmp) {
       styles[ii].name = gbfreadbuf(tmp, tpo_file_in);
     } else { // Assign a generic style name
-      styles[ii].name = QString("STYLE %1").arg(ii);
+      styles[ii].name = QStringLiteral("STYLE %1").arg(ii);
     }
 #ifdef Tracks2012
     //TBD: Should this be TRACKNAMELENGTH?
@@ -1219,7 +1219,7 @@ static void tpo_process_map_notes()
     Waypoint* waypoint_temp = tpo_convert_ll(lat, lon);
 
     // Assign a generic waypoint name
-    waypoint_temp->shortname = QString("NOTE %1").arg(ii + 1);
+    waypoint_temp->shortname = QStringLiteral("NOTE %1").arg(ii + 1);
 
 //UNKNOWN DATA LENGTH
     (void)tpo_read_int();
@@ -1320,7 +1320,7 @@ static void tpo_process_symbols()
     Waypoint* waypoint_temp = tpo_convert_ll(lat, lon);
 
     // Assign a generic waypoint name
-    waypoint_temp->shortname = QString("SYM %1").arg(ii + 1);
+    waypoint_temp->shortname = QStringLiteral("SYM %1").arg(ii + 1);
 
     // Add the waypoint to the chain of waypoints
     waypt_add(waypoint_temp);
@@ -1363,7 +1363,7 @@ static void tpo_process_text_labels()
     Waypoint* waypoint_temp = tpo_convert_ll(lat, lon);
 
     // Assign a generic waypoint name
-    waypoint_temp->shortname = QString("TXT %1").arg(ii + 1);
+    waypoint_temp->shortname = QStringLiteral("TXT %1").arg(ii + 1);
 
     for (int jj = 0; jj < 16; jj++) {
 //UNKNOWN DATA LENGTH

diff --git a/trackfilter.cc b/trackfilter.cc
index fb5f5f63d4e26304eeb4afd61590a3722b5b0c72..a1a435f240fac0d1d76a22890fde4d154b6d9f11 100644 (file)
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -253,10 +253,10 @@ void TrackFilter::trackfilter_split_init_rte_name(route_head* track, const gpsba
       strftime(buff, sizeof(buff), opt_title, &tm);
       track->rte_name = buff;
     } else {
-      track->rte_name = QString("%1-%2").arg(opt_title, datetimestring);
+      track->rte_name = QStringLiteral("%1-%2").arg(opt_title, datetimestring);
     }
   } else if (!track->rte_name.isEmpty()) {
-    track->rte_name = QString("%1-%2").arg(track->rte_name, datetimestring);
+    track->rte_name = QStringLiteral("%1-%2").arg(track->rte_name, datetimestring);
   } else {
     track->rte_name = datetimestring;
   }
@@ -759,7 +759,7 @@ void TrackFilter::trackfilter_seg2trk()
           dest->rte_num = src->rte_num;
           /* name in the form TRACKNAME #n */
           if (!src->rte_name.isEmpty()) {
-            dest->rte_name = QString("%1 #%2").arg(src->rte_name).arg(++trk_seg_num);
+            dest->rte_name = QStringLiteral("%1 #%2").arg(src->rte_name).arg(++trk_seg_num);
           }
 
           /* Insert after original track or after last newly

diff --git a/transform.cc b/transform.cc
index 62d131828695c2bdf9e6d18573d96928f11ea922..c31df15bc3b5e45d9b42397d63a79846f12cb62c 100644 (file)
--- a/transform.cc
+++ b/transform.cc
@@ -73,7 +73,7 @@ void TransformFilter::transform_rte_disp_hdr_cb(const route_head* rte)
     current_trk = new route_head;
     track_add_head(current_trk);
     if (!rte->rte_name.isEmpty()) {
-      current_trk->rte_desc = QString("Generated from route %1").arg(rte->rte_name);
+      current_trk->rte_desc = QStringLiteral("Generated from route %1").arg(rte->rte_name);
       current_trk->rte_name = rte->rte_name; /* name the new trk */
     }
   }

diff --git a/unicsv.cc b/unicsv.cc
index 96f5a1f7a129ba717acf7d8e3d2f2bd0bc3f1b99..acfd05001486e1687f002f1e691d3d54eec02fe7 100644 (file)
--- a/unicsv.cc
+++ b/unicsv.cc
@@ -1370,7 +1370,7 @@ UnicsvFormat::unicsv_waypt_disp_cb(const Waypoint* wpt)
                                          &east, &north, &zone, &zonec, unicsv_datum_idx)) {
       unicsv_fatal_outside(wpt);
     }
-    *fout << QString("%1").arg(zone, 2, 10, QLatin1Char('0')) << unicsv_fieldsep
+    *fout << QStringLiteral("%1").arg(zone, 2, 10, QLatin1Char('0')) << unicsv_fieldsep
           << zonec  << unicsv_fieldsep
           << qSetRealNumberPrecision(0) << east << unicsv_fieldsep
           << north;

diff --git a/waypt.cc b/waypt.cc
index 59c518dc8be467ed929d0368a3772334960ee16a..d87bc9b6ce85584f1d4b498146bd6f82e4487ffd 100644 (file)
--- a/waypt.cc
+++ b/waypt.cc
@@ -617,7 +617,7 @@ WaypointList::waypt_add(Waypoint* wpt)
     } else if (!wpt->notes.isNull()) {
       wpt->shortname = wpt->notes;
     } else {
-      wpt->shortname = QString("WPT%1").arg(waypt_count(), 3, 10, QLatin1Char('0'));
+      wpt->shortname = QStringLiteral("WPT%1").arg(waypt_count(), 3, 10, QLatin1Char('0'));
     }
   }
 
@@ -643,7 +643,7 @@ WaypointList::add_rte_waypt(int waypt_ct, Waypoint* wpt, bool synth, const QStri
   append(wpt);
 
   if (synth && wpt->shortname.isEmpty()) {
-    wpt->shortname = QString("%1%2").arg(namepart).arg(waypt_ct, number_digits, 10, QChar('0'));
+    wpt->shortname = QStringLiteral("%1%2").arg(namepart).arg(waypt_ct, number_digits, 10, QChar('0'));
     wpt->wpt_flags.shortname_is_synthetic = 1;
   }
 }